Bump version, fix bugs