If you are seeing air bubbles then there is the problem as you should not see any bubble at all, air bubbles will let the engine run inconsistently and go lean then shut off. If the bubbles are in the line coming from the tank I would start off the easy way and replace that line. If they continue then pull the tank out and replace the line in the tank from the stopper to the clunk.