Exercise 1 fixups
Exercise 2 fixups
Merge pull request #2 from wal/master

Exercise 1 & 2 fixups