Various changes.
Updated template.