Minor improvements.
Initial pass at combat.
Begin factoring out certain constant properties.