Added some updates after the cw-vm bork