Add exercise 2.
Minor updates.