Fixes from @StevenLawson at TF.
Ported all useful features from MobArena over to TFM.