I checked the timing again and it was off so I corrected that and gave it a quick test drive and I think I've fixed it. I wont know for sure till I go take it to get smoged and take it on the freeway. I would have gone for a longer test drive but the tags are no good and I was super low on gas so I just came back home. I'm going to get some more gas and go get her smoged tomorrow probably.