saving bug fixes