Fixup some stuff
challenges 12 & 13.