update plotting to be more automatic