Implemented some minor template changes.