Improving institution templates and validity checking.