RE: Bubbles in the line
I would try padding the tank first since it's the easiest thing to do.
Actually, the best way to do it is to remove the tank and run the engine. If the bubbles disappear, foaming is the problem.
If the bubbles persist, you've got an air leak