1994 Tercel Cooling System Diagram Help

I just purchased a 1994 Tercel w/ Fuel Injection. It is Manual and Has just had the head and rings done. The hose that attaches to the top of the water pump housing is connected at the other end to the overflow spout on the overflow bottle. I know this is wrong. However, I have not ben able to locate the proper routing. Any help will be appreciated. A scanned schematic would be wonderfull as I suspect that other hoses are routed incorrectly as well. The vehicle obviously overheats.

In addition, the rocker springs were not replaced and the valves not adjusted. Must I replace these springs as the chilton manual states? Or, should I just adjust the valves and then see if it is copasetic?
Raph