debug cleanup
fixed VWP calculation