Better template support. Fix init templates a little bit (ongoing work)