License/Taxonomy check. Various bug fixes and template improvements.
Merge branch 'my'