Merged stuff, made more progress on doc-comment continuations