completed most of the main changes for the game