Need some help! Last week I swapped the old tired 85 engine with a rebuilt 90. Apart from taking a bit more time than I wanted, everything went smoothly. Engine started first go, but was a bit noisy, thought the fan was a little loose. Ran it for awhile, then test drove around the lot with no problems. Went to drive it home from work (where I did the swap) and stopped to get gas. When I went to start it up again - nothing but wrrr wrrr. Had the wife tow me back to the shop, then pulled the little wire and rigged up a direct to battery wire for testing. Still wrrr wrrr, so got a rebuilt starter, installed it, and started it with the direct to battery small wire. Still a little loud, but better, so drove home with no problems. Go to leave the next day, nothing but wrrr wrrr. So pull the starter and return to place I bought it from - dude repairs the starter for free but says you should check your ignition system as the starter seems to be staying engaged (the drive spun both ways). Tell him I am going direct off the battery, and he says thats strange for a toyota. Install new starter, then do what I should have done in the first place and carefully pinpoint where noise is coming from. Its the starter alright, so go retighten torque converter bolts, check fly wheel teeth, and everything checks out. I don't know what to do next, any ideas or solutions would be greatly appreciated.