updates to documentation
Merge branch 'eric_working'