fix rules
some changes