Fixed a tricky save/load bug for non-locked in targets. Also removed some specific-player control tracking that we don't need any more.