fixes and better map editor