Corrections made during session with @dserban