fixing type
adding in first draft content
basic cleanup and a few sylistic changes
Merge branch 'master' into gh-pages