Added Game Over condition and minor changes