a few more template changes