SaveState clenaups and fixes