tapv2: multiple improvements