Multiple changes

Old changes I forgot to commit
Fix save behavior