fix and add information to templates