fixes + dom.template support
dom.template comment