modified notebook and other cleanup