Lot of corrections