Updated vita and templates