Bump version and minor cosmetic adjustments