Some fixes; beginning implementation of notes