couple more fixes + a new rule