More work on plotting.