MORE PLOTS!

And other fixes