edited everything up to 3.2, fixed some typos in .bib