Cleanup (time_zone -> timezone, optional for rule validation)

Also fixed a couple of the rule validations.