Bug fixes, pushed to v0.0.2

Signed-off-by: Chris Southam <me@csoutham.com>