2nd to last day of edits: tons of fixes