Modified map editor version 2.1 with some bugs