Notes - initial work completed and some bug fixes