Fix rules, add rules