A few thoughts about your reply. The leak above the windows on the starboard side is that near the helm or down below? There is a hand rail on some used to get around the sides that if pulled to hard can let water in. As for the fuel tank look into military grade bladders. The previous owner of...