Fixed MapEditor, but still with error on collisions