fixing last issues with rules, tests still passing