Bug Fixes and lots of rules tweaks

• Fixed the bug
• Modified the rules folder, and removed duplicate rules
• Added proper categories for the various rules that get fired

Enjoy the new release!! 🚀