updating to add new rules, cleanup existing checks