Small fix-ups and edits