first round of edits. Mostly syntax