A few more changes.
Merge branch 'master' of github.com:sebastian-claici/6.854-Final