The heater looks like it should be on 8 and 18 instead of 3 and 13, @draubach noticed this when both the ground wire and the heater wire were pinned to the same pin.
@kent the 5v fan needs to be 16 and 6 if you want to lump it into the same commit. Also dont forget to rev the drawing
Ok I relabeled the 5v fan as well with 0d4ef9e6818adcad196db534f9e41d71588308b7
@kent the changes look good to me
This is now merged into master.