Thanks all for the help, it turns out that the problem was that when I put back the TPS I installed it wrong.
Once I figured it out, the problem stopped. Now all I have to do is tune it, since I messed with the idle and timing now I have to adjust that again.
