various changes to plotting