New rulesets

Various new rulesets and fixes for rules.

This time with the correct branch.