latest changes, wpm and zpu probably broken, fixing zvm + zas