fixed 1st notebook and the most part of 2nd