fixed data persistence bug
a couple tweaks