a few updates

Hi @ekfriis,

No major changes here, I just thought I would update the repo with my latest zh code before I left!

Stephane