Continue updates and cleanups.
Small fixes to display notebook.
Small updates.