Small template changes and fixing typos