Misc updates as I sort through my various notes.