More fixes and cleanup to docs