Various updates to plotting.