Cleanup and slight documentation changes.