Edits from Kris, cleanups of bibliography, other stuff