UPDATE
After cleaning all the crud out of the fuel tank, blowing through the fuel lines, removing the lift pump and inspecting, changing the fuel filter, air filter the problem lied with the injector pump. Nothing major thankfully. When idling lumpy and quietly I fiddled with the stop...