some notebook bugs fixed- still a bit of work to do