added rules for last 10 or so rules
fixed merge conflicts