updating templates and code across the board