Some comments & docs
Merge branch 'chris' into dennis
Merge branch 'dennis' into chris