Update version and fix bugs