vm & vnet commands updated

Including fixes after code review