consolidate rule types plus edits