Fix Persistance, various bugs.