Merged fixes & improvements tiled importer