Rules Revision v2

- Further tweaking of default rules