New rules, bugfixes.