Minor fixes, saving should work now