Miscellaneous fixes and edits.