Improved saving, minor bugfix.