style fixes
add xml version tag
fixes
fix cheetah template
fix cheetah template
fix cheetah template
merge