Minor tweaks, update for new topotools
Plotting improvements