Some fixes and refactoring (Ball, Game)