Changes in 2.2.0
  - bug fixes and minor cleanups
