Bumping version and minor bug fixes