Notebook update, minor changes