partly reverted back to previous commit, also separated collision detection more accurately from GameWorld