Add more edits from Dr. Mascher