Foramt and add misc

Clean up format and add a couple items.