Template gen tweaks, bunp version