tweaks in some rules, a few added rules.