various tweaks and cleanups

decided to do a PR against your PR so you can see what i am doing.
Good point. Maybe we should create a rules partial that mentions this.