first set of corrections as requested