handles messages better, new institution field
merged with new templates
added institution field to templates