Add new VP options; fix many vpcounter bugs