Improvements in save handling. Still not enough to avoid Global info losses