Ported all useful features from MobArena over to TFM
Merge with master