various tweaks and cleanups

decided to do a PR against your PR so you can see what i am doing.
but not in the reference i think. i moved a sentence away from the match description, as i think it fits better in each rules section. its not about the match but about the whole rule.