Fixed a name error
Fixed some name errors
Fixed some logic errors
Got normals compiling
Merge remote-tracking branch 'origin/master' into landonMOE
correct player starting position