Lots of changes to formatting, content