more template changes and SSL updates