Changes in 2.1.3
  - bug fixes and minor cleanups
