More work on martial drills, misc bugfixes, a few tweaks to trade