Fixed text()/$, renamed fn.template