Minor edits and fixes