Updated main/game
more edits