more notes and a few fixes