Fix typo in template name
Fix small typographical errors and a missing return