Some updates from Steve
Merge branch 'review' into gh-pages