Final fixes as per ray

Not counting figures!  Figures still need to be improved.