New rulesets

This branch contains a whole bunch of new rulesets and fixes.