Timob 12610

Documentation updates. Okay, now time to merge if CR and such pass.