Added template comments
Added template comments and more content