Bug fixes, last 3.x release

Fixes #132 and #134.

This is probably the last 3.x release, install using npm install -g [email protected]
The rest of the bugs have been punted to the 4.2.0 milestone.