Final commit before talk
Minor changes which did not make it into the talk