diff --git a/Manual.org b/Manual.org
index e2f8698..0e970cb 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1687,7 +1687,7 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
 # *	*			 dibusb               # found in dibusb-common.c
 # *	*			 digitv               # found in digitv.c
 # *	*			 megasky              # found in m920x.c
-# *	*			 tvwalkerir-kbd-i2c	rc-hauppauge			/lib/udev/rc_keymaps/rc-hauppaugetwin         # found in m920x.c
+# *	*			 tvwalkerir-kbd-i2c   # found in m920x.c
 # *	*			 pinnacle310e         # found in m920x.c
 # *	*			 haupp                # found in nova-t-usb2.c
 # *	*			 opera1               # found in opera1.c
@@ -2459,8 +2459,8 @@ preferred_refreshrates:
 
 - name: update xorg and xrandr variable with values from local facts if needed
   set_fact:
-    xorg: '{{ ansible_local.xorg }}'
-    xrandr: '{{ ansible_local.xrandr }}'
+    xorg: '{{ ansible_local.xorg.xorg }}'
+    xrandr: '{{ ansible_local.xrandr.xrandr }}'
   when:
     - xrandr is undefined
     - xorg is undefined
@@ -5242,7 +5242,7 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
 :PROPERTIES:
 :ID:       f03f3758-9188-4e98-a26a-bbddf14d8194
 :END:
-This role installs the guest additions for virtualbox guests on Ubuntu 16.04
+This role installs the guest additions for virtualbox guests on Ubuntu 18.04
 
 #+BEGIN_SRC yaml :tangle roles/autoinstall-virtualbox-guest/tasks/main.yml :padline no
 ---
diff --git a/README.md b/README.md
index f1cd603..3f58988 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Please note that this is still work in progress and several features of yaVDR 0.
 - 32 Bit Installations are untested, but should work
 - You need an IGP/GPU with support for VDPAU or VAAPI if you want to use software output plugins for VDR like softhddevice or vaapidevice
 - xineliboutput/vdr-sxfe works with software rendering, too
-- Can be used in a VirtualBox VM
+- Can be used in a VirtualBox VM (VirtualBox 5.22 works better than Version 6.0.0)
 
 ## Usage:
 
diff --git a/library/xrandr_facts.py b/library/xrandr_facts.py
index d793579..9e65482 100755
--- a/library/xrandr_facts.py
+++ b/library/xrandr_facts.py
@@ -25,7 +25,7 @@ options:
           - the DISPLAY variable to use when calling xrandr
     preferred_outputs:
         required: False
-        default: ["HDMI", "DP", "DVI", "VGA", "TV"]
+        default: ["HDMI", "DP", "DVI", "VGA", "TV", "Virtual"]
         description:
           - ranking of the preferred display connectors
     preferred_refreshrates:
@@ -59,7 +59,7 @@ EXAMPLES = '''
 ARG_SPECS = {
     'display': dict(default=":0", type='str', required=False),
     'preferred_outputs': dict(
-        default=["HDMI", "DP", "DVI", "VGA", "TV"], type='list', required=False),
+        default=["HDMI", "DP", "DVI", "VGA", "TV", "Virtual"], type='list', required=False),
     'preferred_refreshrates': dict(
         default=[50, 60, 75, 30, 25], type='list', required=False),
     'preferred_resolutions': dict(
@@ -71,7 +71,7 @@ ARG_SPECS = {
 
 SCREEN_REGEX = re.compile("^(?P<screen>Screen\s\d+:)(?:.*)")
 CONNECTOR_REGEX = re.compile(
-    "^(?P<connector>.*-\d+)\s(?P<connection_state>connected|disconnected)\s(?P<primary>primary)?")
+    "^(?P<connector>.*-?\d+)\s(?P<connection_state>connected|disconnected)\s(?P<primary>primary)?")
 MODE_REGEX = re.compile("^\s+(?P<resolution>\d{3,}x\d{3,}).*")
 
 Mode = namedtuple('Mode', ['connection', 'resolution', 'refreshrate'])
diff --git a/roles/yavdr-remote/templates/rc_maps.cfg.j2 b/roles/yavdr-remote/templates/rc_maps.cfg.j2
index d4eaf06..de3f26b 100644
--- a/roles/yavdr-remote/templates/rc_maps.cfg.j2
+++ b/roles/yavdr-remote/templates/rc_maps.cfg.j2
@@ -173,7 +173,7 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
 # *	*			 dibusb               # found in dibusb-common.c
 # *	*			 digitv               # found in digitv.c
 # *	*			 megasky              # found in m920x.c
-# *	*			 tvwalkerir-kbd-i2c	rc-hauppauge			/lib/udev/rc_keymaps/rc-hauppaugetwin         # found in m920x.c
+# *	*			 tvwalkerir-kbd-i2c   # found in m920x.c
 # *	*			 pinnacle310e         # found in m920x.c
 # *	*			 haupp                # found in nova-t-usb2.c
 # *	*			 opera1               # found in opera1.c
diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml
index a072bcf..4cfd214 100644
--- a/roles/yavdr-xorg/tasks/detect-xorg.yml
+++ b/roles/yavdr-xorg/tasks/detect-xorg.yml
@@ -131,8 +131,8 @@
 
 - name: update xorg and xrandr variable with values from local facts if needed
   set_fact:
-    xorg: '{{ ansible_local.xorg }}'
-    xrandr: '{{ ansible_local.xrandr }}'
+    xorg: '{{ ansible_local.xorg.xorg }}'
+    xrandr: '{{ ansible_local.xrandr.xrandr }}'
   when:
     - xrandr is undefined
     - xorg is undefined
diff --git a/roles/yavdr-xorg/templates/xorg-verbose.conf.j2 b/roles/yavdr-xorg/templates/xorg-verbose.conf.j2
index 461eeba..1722a4d 100644
--- a/roles/yavdr-xorg/templates/xorg-verbose.conf.j2
+++ b/roles/yavdr-xorg/templates/xorg-verbose.conf.j2
@@ -1,3 +1,5 @@
+{{ ansible_managed | comment }}
+
 Section "Device"
         Identifier "nvidia"
         Driver  "nvidia"