Mostly minor clarifications and edits