Improve notebook and dispersion analysis