Big changes

Added setting rules, minor tweeks
Setting rules update