Changes in 3.0.4
  - bug fixes and minor cleanups
