Various notebook tweaks and polishing
renamed