more notes and fixes