Add Templates per suggestion.
Apply missing Errata.