fixed frontmatter; more cleanups