corrections

Everything I discussed in the e-mail from 26/08, as well as some small other corrections.