bug fixes and started setting up for game menu and other game states