Did problem 17.  Fixed up some names.