Update version and small changes