A few fixups and edits