Fix plot generation sequence... probably need a few more?