Lint templates.
Minor fixes in initial import.