extended notebook; tidying up is nearly done