better unload, fix add layer action