More fixes / notes.