Exercise 5 done correctly ?

Can someone tell me if this visualization looks correct after exercise 5?

(note there is no representation of coal or wind)

Much appreciated
Leigh

Also would the same for exercise 6 be possible too?

note is yield too low for rice ?

Best
Leigh