Exercise 1 edits

...a few more adjustments.