Small cleanup and doc updates