more notes and cleanup