2.11 tweaks
Doc clean up