Bunch of corrections!