Here's a quick solution to the Clunk-to-the-front-of-the-Tank problem. Put a piece of brass or plastic tubing (some tank MFGR's supply the plastic tubing with the tanks (in the feed line INSIDE the tank). The clunk can still swing, but can't bend forward.