Add auto-complete and fixes around restarting game when it finishes.