Minor changes around the place, also intial commit for map editor