OP, as for your question of what else to do while you're in there, it never hurts to check everything out while you're in there, to note for any odd fluid leakages, mold, whatever. Just clean things up while you're in there, and if I might make a recommendation, either replace the heater core...