Noted V2.2.0 required changes with TODO. Fixed some typos.