Added Drain Gauge code and other minor fixes