First round of revisions from facebook CSAGSI members