[haida template] comments
Merge pull request #139 from michalbe/flatfish-template-temp

[haida template] comments