markdown, hyphens, detailed templating continued