A WHOLE lot of changes based on Jens's suggestions...
Starting on Combat.
Fixed some template changes that were missed.