Bunch of bug fixes and game states