removed a couple of notes to myself - they have been handled