Good diagram but id add the black dots on the connections to differentiate them from just crossing wires.
And you where right on about the carb heater. I can now wire a carb america in my sleep hahaha.