Fixed up plotting to be a little bit more efficient.