Clean Up & final problem

Had solutions one and two the wrong way around so corrected that. I've
also added the solution to problem three.