bunch of corrections