New rulesets

New rulesets and fixes.

[GitHub is confusing at first, this time merge the right way].