Fix timing in game
Make sure everything works