More VPOLL changes. Also some misc fixes