One issue fixed. The fuel line connector on the motor end was bad. Marina mechanic changed it out, fixing the fuel leak. Replacement looks to be built better than the original.
Will be looking again at the internal tank tomorrow.