finished the last touches on templates