Lots of corrections and additions