Complete exercises (with comment addressed)

This addresses the comments in pull request #52.