Added new rule, fixed some old rules