Various fixes, all complete except question 5 from part 2.