added VWP & fixed bugs