more progress
Merge branch '3.8.6' of https://github.com/pavpanchekha/6.829-project into 3.8.6