Updates to doc, cleanups