Add semver / fix some vars