Furhter fixes of this plotting.