Doc cleanup

Probably not ready to merge.

I would like feed back on most of this.
Why comment it out?