more plotting.py fixes