Fixed errors

Fixed some errors with introduction of new game engine code
Fixing merging issues

Fixing merging issues