Various fixes and edits.