some more cleanup; now to try and deal with changing notebook show