minor edits
catching up with Michael's changes