various fixes.
Merge branch 'ampcamp4' of github.com:amplab/training into ampcamp4