Misc cleanup and notes.