Vz branch

I fixed some bugs, so make run-vz is passed on PCS6.