did some more calculations in notebook, locally
fixed .gitignore conflicts