Woops forgot to update. Short answer is I don't know if it's fixed yet because I haven't been able to drive it due to weather. Replaced the camshaft position sensor, crankshaft position sensor, map, and maf. It starts and runs fine in the garage but I won't know until I drive it. Had a bit of a panic on Christmas too, I still had water in the system and when it got cold over Christmas it was still about 40 in the garage until Christmas day when it got down to 25. I saw some early signs of slush in the reservoir. Fired up the propane heater and got it cooking to 80 degrees in there, left the heater running for about 7 hours then drained the water and put coolant in Christmas day. Seems like I barely escaped a real bad day.