updated save and store

fixed errors / debugging