Improved demo plotting.