lots of updates, including frontmatter and comments