Cleanup

Lots of nbviewer cleanup. Sorry I was in a train, so the history is ugly and not in many PR, mostly a work in progress.