Some cleanup, updated the rules to conform with what will probably become Mike Le Page's rule set 5.1