retouched templates, still mess
more fixes to the voic-pin system