update rules to fix some problems and more closely match the current rules. fixes #126