Devel

last zerovm 2 changes and fixes