little changes in some functions: save, move