Basic updates to the rules to match conventions.