Some fixes and notes.