some fixes and editor map