Version bump, style fixes