bugfix and ipynb cleanup