Add support for multi-tank machines, fix liquid router