Fixed homework according to Toal's solutions