Fixes from jfresco's review.
Done lesson 08.