Feedback fixes. Minor template changes.