Minor changes, post Alex's merge.
Made a pdf of final version.