Fixed a few game-play bugs with the timer