Rule improvements

Some good improvements to the attacker rules, minor improvements to
defender rules, and slight alterations to the catcher rules. Also
training.