first round of edits suggested by Rodrigo