Thanks for all your suggestions. The bike is still running the same so we are taking it back to the shop in the morning. To answer some of the questions - the throttle position sensor was checked at the shop on Saturday, the FI light is not lit up, have had different tanks of gas in it with no change in running (was completely drained when we cleaned the fuel pump screen), did not fill with diesel, seems to rev up in neutral but accelerating briskly or under load stumbles and jerks, all hoses are hooked up and there are no cracks.