save changes still buggy