Merged changes from TenPlus1's Mobs Redo [0.4]