Fix #77: Update docs according to the talk notes