MapEditor: Correction & factoring