edits, code highlights, polish