MapEditor: Correction + better code