Templatify registering + fixes + improvements