Added unused RuleSet and applied some of the wisdom gained while writing it to other places.
Fixes for 1.9.