Squash some bugs
Bump version number