further improvements to plotting structure