last-minute doc changes
Merge branch 'cleanup'