fixed save bug & re-implemented save code