Bug fixes to get Tetris working