More tweaks

Mostly fixing up things, continued TargetID work, and I fixed minmode
toggling Highlander mode again.