save & other fixes