Few Bug fixes

Fixed some niggling bugs as well as add the ability to finish one game
and return to the menu so a next game can begin.