clarifies some points in the write-up
fixes merge conflict