Some more notes and comments, small cleanups.