Loads of Random changes & broke the map editor

I hate the map editor code.