Bugfixes, player controls, optimized code
Fix inconsistencies
Merge remote-tracking branch 'origin/master'