Revision

This merge contains an overhaul of combat to improve ranged combat.