Update docs (partial). Closes #2081. Closes #2043