improved saving handles, cleanups