Further doc cleanup and modified build.