Cleanup and more doc changes.