diff --git a/uncloud/hack/main.py b/uncloud/hack/main.py
index 4778ef6..fc54da1 100644
--- a/uncloud/hack/main.py
+++ b/uncloud/hack/main.py
@@ -56,13 +56,14 @@ def main(arguments):
                          use_sudo=arguments['use_sudo'])
         vb._setup_vxlan()
         vb._setup_bridge()
+        vb._add_vxlan_to_bridge()
         vb._route_network()
 
     if arguments['run_dns_ra']:
         if not arguments['network'] or not arguments['vni']:
             raise UncloudException("Providing DNS/RAs requires a /64 IPv6 network and a VNI. You can use fd00::/64 and vni=1 for testing (non production!)")
 
-        dnsra = DNSRA(route=arguments['network'], 
+        dnsra = DNSRA(route=arguments['network'],
                       vni=arguments['vni'],
                       use_sudo=arguments['use_sudo'])
         dnsra._setup_dnsmasq()
diff --git a/uncloud/hack/vm.py b/uncloud/hack/vm.py
index 24eb108..bb35348 100755
--- a/uncloud/hack/vm.py
+++ b/uncloud/hack/vm.py
@@ -36,8 +36,8 @@ class VM(object):
              self.db = DB(self.config, prefix="/vm")
 
         #TODO: Select generic
-        #self.hackprefix="/home/nico/vcs/uncloud/uncloud/hack/hackcloud" #TODO: Should be removed midterm
-        self.hackprefix="/home/rouxdo/Work/ungleich/uncloud/uncloud/hack/hackcloud" #TODO: Dominique testing
+        self.hackprefix="/home/nico/vcs/uncloud/uncloud/hack/hackcloud" #TODO: Should be removed midterm
+        #self.hackprefix="/home/rouxdo/Work/ungleich/uncloud/uncloud/hack/hackcloud" #TODO: Dominique testing
         self.qemu="/usr/bin/qemu-system-x86_64" #TODO: should be in config
         self.accel="kvm" #TODO: should be config
 
@@ -67,14 +67,19 @@ class VM(object):
         #self.vni_hex = "{:x}".format(self.config.arguments['vni'])
         self.bridgedev = "br{}".format("{:x}".format(self.config.arguments['vni']))
 
-        #TODO: Enable sudo
+        #TODO: Enable sudo -- FIXME!
         if self.config.arguments['use_sudo']:
             self.sudo = "sudo"
+        else:
+            self.sudo = ""
+
 
         self.mac=MAC(self.config)
         self.mac.create()
         self.vm['ifname'] = "uc{}".format(self.mac.to_str_format())
 
+        # FIXME: TODO: turn this into a string and THEN
+        # .split() it later -- easier for using .format()
         #self.vm['commandline'] = [ "{}".format(self.sudo),
         self.vm['commandline'] = [ "{}".format(self.sudo),
                                     "{}".format(self.qemu),