Misc fixes, and a better system for reacting to nearby fights