Update plotting, still in heavy dev.