New rules and some minor fixes.