more notes and bug fixes