fix re-save bug and start integrating walk simulator