Reworked rule packages, corrected some false-positives in rules