fixing some glitches and new VM adoption