various tonal template stuff
Fixing merge conflicts
tonal template tweaks