renamed a few more members and changed some switch statements