Continued edits

Worked through Andy's list