notebook changes and fixes