minor edits/syntax changes