tweak plotting
improve numerical robustness further
tweak plotting again