Feature/post launch tpl updates