a few notes, fixes, etc