More work on notebooks, mostly comments