Fixed persistent data
Fixed all persist data stuff
Fix merge conflicts