Some doc fixes. See: https://gist.github.com/ab0c7f9747309d9c998c