misc bug fixes, new notebook