The wiper mechanism was in working order but needed some cleaning and new grease. I used best parts from three different units to get it as clean and rust free as possible.
Heater unit overhaul
The heater unit was a mess and some of the plastic parts were also damaged, so I took apart two different heater units and used the best parts from those also.