A lot of batch corrections and additions