Lots of changes to game.js