Some minor code improvements, new notebook