saving
Some fixes again