Added support for restarting a game.  Also fixed up a few odds and ends