Some reformatting, bib updates, minor editing