Second round of edits, too many changes to mention imsosorry