Bumping version and minor template updates