Minor cleanups and doc updates