Further work on notes, almost complete