Re diesel leak
I have a 34 foot trawler and my leak was caused by non diesel pvc pipe going to the top of the diesel tank, also the valves weren't set right in the aft area. Make sure they are all open, turn all valves counter clockwise (wheel valves and levers) this stopped mine from leaking...