Upgrade mcq, tfq, improve ddq_tree