Did some more fixing of front matter format