changes to save data

also deleted commented out material