fixed more saving problems