Lots of corrections