fixed tyops, started with templates