Bugfixes + fill mode for notebook, but without any UI