fix restore, cleanups, doc updates