Fixed #4, some cleanup, updated the game to conform with what will probably be Mike Le Page's rule set 5.1