Fixes to rendering problems, equipment/maintenance fix and Move maps to own controller