make some heavy improvements to 2d autoplot function