fixes/testing for data saving