map editing beta,several fixes