* Revamped the notebook

* A few changes reversed

Changed a few things from my original PR after a review from ad71.