Improved plotting.