Fixed game over and other bugs