Tidy up dissertation and add paper references