fixing weird provisioning and missing type
move templates
merge