Some format changes and some additions.