Better look for map editor, minor fixes