A few bug fixes + bumped version