Bug fixes and play again

Please pull into master, Sikeman.  Added play again and a major bug fix.