Template fixes

a few fixes after adding regions