more bug fixes with save