edits from cristins punch list email, sep 8