Reorganized and Expanded doc

I reorganized and added Andy's comments in everything up to
expectations.