Now it drains properly.

Still have odd full-tank bug.