Support values other than tabs; better p3 support