diff --git a/GIT-VIRL-HS-Fulda/KOMPROT_wanem_uebung.virl b/GIT-VIRL-HS-Fulda/KOMPROT_wanem_uebung.virl
index eafa9527eb6bb4697887d13d92801a85fca0ada4..fd2fcf74314317c2e5ea25057b452035895cf0cc 100644
--- a/GIT-VIRL-HS-Fulda/KOMPROT_wanem_uebung.virl
+++ b/GIT-VIRL-HS-Fulda/KOMPROT_wanem_uebung.virl
@@ -5,84 +5,84 @@
             <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
             <entry key="AutoNetkit.IGP" type="String">eigrp</entry>
             <entry key="Auto-generate config" type="Boolean">false</entry>
-            <entry key="config" type="String">! IOS Config generated on 2015-09-06 21:22
-! by autonetkit_0.18.1
-!
-hostname iosv-1
-boot-start-marker
-boot-end-marker
-!
-vrf definition Mgmt-intf
-!
- address-family ipv4
- exit-address-family
- !
- address-family ipv6
- exit-address-family
-!
-!
-!
-no aaa new-model
-!
-!
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service config
-enable password cisco
-ip classless
-ip subnet-zero
-no ip domain lookup
-line vty 0 4
- transport input ssh telnet
- exec-timeout 720 0
- password cisco
- login
-line con 0
- password cisco
-!
-no cdp run
-!
-!
-interface Loopback0
-  description Loopback
-  ip address 192.168.0.2 255.255.255.255
-!
-interface GigabitEthernet0/0
-  description OOB Management
-  vrf forwarding Mgmt-intf
-  ! Configured on launch
-  no ip address
-  duplex full
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/1
-  description to wanEM
-  ip address 192.168.101.2 255.255.255.252
-  duplex full
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/2
-  description to server-1
-  ip address 192.168.1.1 255.255.255.0
-  duplex full
-  speed auto
-  no shutdown
-!
-!
-!
-
-!
-ip route 0.0.0.0 0.0.0.0 192.168.101.1
-!
-end
+            <entry key="config" type="String">! IOS Config generated on 2015-09-06 21:22&#xD;
+! by autonetkit_0.18.1&#xD;
+!&#xD;
+hostname Router-A&#xD;
+boot-start-marker&#xD;
+boot-end-marker&#xD;
+!&#xD;
+vrf definition Mgmt-intf&#xD;
+!&#xD;
+ address-family ipv4&#xD;
+ exit-address-family&#xD;
+ !&#xD;
+ address-family ipv6&#xD;
+ exit-address-family&#xD;
+!&#xD;
+!&#xD;
+!&#xD;
+no aaa new-model&#xD;
+!&#xD;
+!&#xD;
+ip cef&#xD;
+ipv6 unicast-routing&#xD;
+ipv6 cef&#xD;
+!&#xD;
+!&#xD;
+service timestamps debug datetime msec&#xD;
+service timestamps log datetime msec&#xD;
+no service password-encryption&#xD;
+no service config&#xD;
+enable password cisco&#xD;
+ip classless&#xD;
+ip subnet-zero&#xD;
+no ip domain lookup&#xD;
+line vty 0 4&#xD;
+ transport input ssh telnet&#xD;
+ exec-timeout 720 0&#xD;
+ password cisco&#xD;
+ login&#xD;
+line con 0&#xD;
+ password cisco&#xD;
+!&#xD;
+no cdp run&#xD;
+!&#xD;
+!&#xD;
+interface Loopback0&#xD;
+  description Loopback&#xD;
+  ip address 192.168.0.2 255.255.255.255&#xD;
+!&#xD;
+interface GigabitEthernet0/0&#xD;
+  description OOB Management&#xD;
+  vrf forwarding Mgmt-intf&#xD;
+  ! Configured on launch&#xD;
+  no ip address&#xD;
+  duplex full&#xD;
+  speed auto&#xD;
+  no shutdown&#xD;
+!&#xD;
+interface GigabitEthernet0/1&#xD;
+  description to wanEM&#xD;
+  ip address 192.168.101.2 255.255.255.252&#xD;
+  duplex full&#xD;
+  speed auto&#xD;
+  no shutdown&#xD;
+!&#xD;
+interface GigabitEthernet0/2&#xD;
+  description to server-1&#xD;
+  ip address 192.168.1.1 255.255.255.0&#xD;
+  duplex full&#xD;
+  speed auto&#xD;
+  no shutdown&#xD;
+!&#xD;
+!&#xD;
+!&#xD;
+&#xD;
+!&#xD;
+ip route 0.0.0.0 0.0.0.0 192.168.101.1&#xD;
+!&#xD;
+end&#xD;
 </entry>
         </extensions>
         <interface id="0" name="GigabitEthernet0/1" ipv4="192.168.101.2" netPrefixLenV4="24"/>
@@ -93,69 +93,69 @@ end
     <node name="Client" type="SIMPLE" subtype="server" location="158,285">
         <extensions>
             <entry key="Auto-generate config" type="Boolean">false</entry>
-            <entry key="config" type="String">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: server-1
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.18.9
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /etc/rc.local
-  owner: root:root
-  permissions: '0755'
-  content: |-
-    !/bin/sh -e
-    ifconfig eth1 up 192.168.1.100 netmask 255.255.255.0
-    route del default
-    route add default gw 192.168.1.1
-    arp -i eth1 -s 192.168.1.1 aa:aa:aa:aa:aa:aa
-    exit 0
-
-- path: /etc/resolv.conf
-  owner: root:root
-  permissions: '0644'
-  content: |
-    #by Patrick.
-    nameserver 8.8.8.8
+            <entry key="config" type="String">#cloud-config&#xD;
+bootcmd:&#xD;
+- ln -s -t /etc/rc.d /etc/rc.local&#xD;
+hostname: Client&#xD;
+manage_etc_hosts: true&#xD;
+runcmd:&#xD;
+- start ttyS0&#xD;
+- systemctl start getty@ttyS0.service&#xD;
+- systemctl start rc-local&#xD;
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config&#xD;
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config&#xD;
+- service ssh restart&#xD;
+- service sshd restart&#xD;
+users:&#xD;
+- default&#xD;
+- gecos: User configured by VIRL Configuration Engine 0.18.9&#xD;
+  lock-passwd: false&#xD;
+  name: cisco&#xD;
+  plain-text-passwd: cisco&#xD;
+  shell: /bin/bash&#xD;
+  ssh-authorized-keys:&#xD;
+  - VIRL-USER-SSH-PUBLIC-KEY&#xD;
+  sudo: ALL=(ALL) ALL&#xD;
+write_files:&#xD;
+- path: /etc/init/ttyS0.conf&#xD;
+  owner: root:root&#xD;
+  content: |&#xD;
+    # ttyS0 - getty&#xD;
+    # This service maintains a getty on ttyS0 from the point the system is&#xD;
+    # started until it is shut down again.&#xD;
+    start on stopped rc or RUNLEVEL=[12345]&#xD;
+    stop on runlevel [!12345]&#xD;
+    respawn&#xD;
+    exec /sbin/getty -L 115200 ttyS0 vt102&#xD;
+  permissions: '0644'&#xD;
+- path: /etc/systemd/system/dhclient@.service&#xD;
+  content: |&#xD;
+    [Unit]&#xD;
+    Description=Run dhclient on %i interface&#xD;
+    After=network.target&#xD;
+    [Service]&#xD;
+    Type=oneshot&#xD;
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease&#xD;
+    RemainAfterExit=yes&#xD;
+  owner: root:root&#xD;
+  permissions: '0644'&#xD;
+- path: /etc/rc.local&#xD;
+  owner: root:root&#xD;
+  permissions: '0755'&#xD;
+  content: |-&#xD;
+    !/bin/sh -e&#xD;
+    ifconfig eth1 up 192.168.1.100 netmask 255.255.255.0&#xD;
+    route del default&#xD;
+    route add default gw 192.168.1.1&#xD;
+    arp -i eth1 -s 192.168.1.1 aa:aa:aa:aa:aa:aa&#xD;
+    exit 0&#xD;
+&#xD;
+- path: /etc/resolv.conf&#xD;
+  owner: root:root&#xD;
+  permissions: '0644'&#xD;
+  content: |&#xD;
+    #by Patrick.&#xD;
+    nameserver 8.8.8.8&#xD;
   </entry>
         </extensions>
         <interface id="0" name="eth1" ipv4="192.168.1.100" netPrefixLenV4="24"/>
@@ -163,28 +163,30 @@ write_files:
     <node name="ISP" type="SIMPLE" subtype="wanEM" location="340,139" vmImage="wanEM-bash-init-aktuell [d38b887a-e92a-41ad-9f86-f6d81d7afeb8]" vmFlavor="m1.small [2]">
         <extensions>
             <entry key="Auto-generate config" type="Boolean">false</entry>
-            <entry key="config" type="String">    ifconfig eth1 up 192.168.101.1 netmask 255.255.255.252
-    ifconfig eth2 up 192.168.102.1 netmask 255.255.255.252
-
-
-    dhclient eth0
-    dhclient eth3
-
-
-    route add default gw 172.16.1.254 eth3
-    route add -net 192.168.101.0/30 gw 192.168.101.2 dev eth1
-    route add -net 192.168.1.0/24 gw 192.168.101.2 dev eth1
-    route add -net 192.168.102.0/30 gw 192.168.102.2 dev eth2
-    route add -net 192.168.2.0/24 gw 192.168.102.2 dev eth2
-
-
-     iptables -t nat -A POSTROUTING -o eth3 -j MASQUERADE
-     iptables -A FORWARD -i eth2 -j ACCEPT
-     iptables -A FORWARD -i eth1 -j ACCEPT
-     /sbin/tc qdisc add dev eth3 root handle 1:1 netem delay 100ms
-     service ssh start
-
-    exit 0
+            <entry key="config" type="String">    ifconfig eth1 up 192.168.101.1 netmask 255.255.255.252&#xD;
+    ifconfig eth2 up 192.168.102.1 netmask 255.255.255.252&#xD;
+&#xD;
+&#xD;
+    dhclient eth0&#xD;
+    dhclient eth3&#xD;
+&#xD;
+&#xD;
+    route add default gw 172.16.1.254 eth3&#xD;
+    route add -net 192.168.101.0/30 gw 192.168.101.2 dev eth1&#xD;
+    route add -net 192.168.1.0/24 gw 192.168.101.2 dev eth1&#xD;
+    route add -net 192.168.102.0/30 gw 192.168.102.2 dev eth2&#xD;
+    route add -net 192.168.2.0/24 gw 192.168.102.2 dev eth2&#xD;
+&#xD;
+&#xD;
+     iptables -t nat -A POSTROUTING -o eth3 -j MASQUERADE&#xD;
+     iptables -A FORWARD -i eth2 -j ACCEPT&#xD;
+     iptables -A FORWARD -i eth1 -j ACCEPT&#xD;
+     /sbin/tc qdisc add dev eth3 root handle 1:1 netem delay 100ms&#xD;
+     service ssh start&#xD;
+&#xD;
+     hostname ISP&#xD;
+&#xD;
+    exit 0&#xD;
 </entry>
         </extensions>
         <interface id="0" name="Ethernet1" ipv4="192.168.101.1" netPrefixLenV4="24"/>
@@ -195,84 +197,84 @@ write_files:
         <extensions>
             <entry key="AutoNetkit.mgmt_ip" type="string"></entry>
             <entry key="Auto-generate config" type="Boolean">false</entry>
-            <entry key="config" type="String">! IOS Config generated on 2015-09-06 21:22
-! by autonetkit_0.18.1
-!
-hostname iosv-2
-boot-start-marker
-boot-end-marker
-!
-vrf definition Mgmt-intf
-!
- address-family ipv4
- exit-address-family
- !
- address-family ipv6
- exit-address-family
-!
-!
-!
-no aaa new-model
-!
-!
-ip cef
-ipv6 unicast-routing
-ipv6 cef
-!
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service config
-enable password cisco
-ip classless
-ip subnet-zero
-no ip domain lookup
-line vty 0 4
- transport input ssh telnet
- exec-timeout 720 0
- password cisco
- login
-line con 0
- password cisco
-!
-no cdp run
-!
-!
-interface Loopback0
-  description Loopback
-  ip address 192.168.0.3 255.255.255.255
-!
-interface GigabitEthernet0/0
-  description OOB Management
-  vrf forwarding Mgmt-intf
-  ! Configured on launch
-  no ip address
-  duplex full
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/1
-  description to wanEM
-  ip address 192.168.102.2 255.255.255.252
-  ip ospf cost 1
-  duplex full
-  speed auto
-  no shutdown
-!
-interface GigabitEthernet0/2
-  description to server-2
-  ip address 192.168.2.1 255.255.255.0
-  ip ospf cost 1
-  duplex full
-  speed auto
-  no shutdown
-!
-!
-!
-ip route 0.0.0.0 0.0.0.0 192.168.102.1
- !
-end
+            <entry key="config" type="String">! IOS Config generated on 2015-09-06 21:22&#xD;
+! by autonetkit_0.18.1&#xD;
+!&#xD;
+hostname Router-B&#xD;
+boot-start-marker&#xD;
+boot-end-marker&#xD;
+!&#xD;
+vrf definition Mgmt-intf&#xD;
+!&#xD;
+ address-family ipv4&#xD;
+ exit-address-family&#xD;
+ !&#xD;
+ address-family ipv6&#xD;
+ exit-address-family&#xD;
+!&#xD;
+!&#xD;
+!&#xD;
+no aaa new-model&#xD;
+!&#xD;
+!&#xD;
+ip cef&#xD;
+ipv6 unicast-routing&#xD;
+ipv6 cef&#xD;
+!&#xD;
+!&#xD;
+service timestamps debug datetime msec&#xD;
+service timestamps log datetime msec&#xD;
+no service password-encryption&#xD;
+no service config&#xD;
+enable password cisco&#xD;
+ip classless&#xD;
+ip subnet-zero&#xD;
+no ip domain lookup&#xD;
+line vty 0 4&#xD;
+ transport input ssh telnet&#xD;
+ exec-timeout 720 0&#xD;
+ password cisco&#xD;
+ login&#xD;
+line con 0&#xD;
+ password cisco&#xD;
+!&#xD;
+no cdp run&#xD;
+!&#xD;
+!&#xD;
+interface Loopback0&#xD;
+  description Loopback&#xD;
+  ip address 192.168.0.3 255.255.255.255&#xD;
+!&#xD;
+interface GigabitEthernet0/0&#xD;
+  description OOB Management&#xD;
+  vrf forwarding Mgmt-intf&#xD;
+  ! Configured on launch&#xD;
+  no ip address&#xD;
+  duplex full&#xD;
+  speed auto&#xD;
+  no shutdown&#xD;
+!&#xD;
+interface GigabitEthernet0/1&#xD;
+  description to wanEM&#xD;
+  ip address 192.168.102.2 255.255.255.252&#xD;
+  ip ospf cost 1&#xD;
+  duplex full&#xD;
+  speed auto&#xD;
+  no shutdown&#xD;
+!&#xD;
+interface GigabitEthernet0/2&#xD;
+  description to server-2&#xD;
+  ip address 192.168.2.1 255.255.255.0&#xD;
+  ip ospf cost 1&#xD;
+  duplex full&#xD;
+  speed auto&#xD;
+  no shutdown&#xD;
+!&#xD;
+!&#xD;
+!&#xD;
+ip route 0.0.0.0 0.0.0.0 192.168.102.1&#xD;
+ !&#xD;
+end&#xD;
 </entry>
         </extensions>
         <interface id="0" name="GigabitEthernet0/1"/>
@@ -348,69 +350,69 @@ write_files:
     <node name="Server-A" type="SIMPLE" subtype="server" location="650,215">
         <extensions>
             <entry key="Auto-generate config" type="Boolean">false</entry>
-            <entry key="config" type="String">#cloud-config
-bootcmd:
-- ln -s -t /etc/rc.d /etc/rc.local
-hostname: Server-B
-manage_etc_hosts: true
-runcmd:
-- start ttyS0
-- systemctl start getty@ttyS0.service
-- systemctl start rc-local
-- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config
-- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config
-- service ssh restart
-- service sshd restart
-users:
-- default
-- gecos: User configured by VIRL Configuration Engine 0.18.9
-  lock-passwd: false
-  name: cisco
-  plain-text-passwd: cisco
-  shell: /bin/bash
-  ssh-authorized-keys:
-  - VIRL-USER-SSH-PUBLIC-KEY
-  sudo: ALL=(ALL) ALL
-write_files:
-- path: /etc/init/ttyS0.conf
-  owner: root:root
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
-    start on stopped rc or RUNLEVEL=[12345]
-    stop on runlevel [!12345]
-    respawn
-    exec /sbin/getty -L 115200 ttyS0 vt102
-  permissions: '0644'
-- path: /etc/systemd/system/dhclient@.service
-  content: |
-    [Unit]
-    Description=Run dhclient on %i interface
-    After=network.target
-    [Service]
-    Type=oneshot
-    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease
-    RemainAfterExit=yes
-  owner: root:root
-  permissions: '0644'
-- path: /etc/rc.local
-  owner: root:root
-  permissions: '0755'
-  content: |-
-    #!/bin/sh -e
-    ifconfig eth1 up 192.168.2.200 netmask 255.255.255.0
-    route del default
-    route add default gw 192.168.2.1
-    exit 0
-
-- path: /etc/resolv.conf
-  owner: root:root
-  permissions: '0644'
-  content: |
-    # ttyS0 - getty
-    # This service maintains a getty on ttyS0 from the point the system is
-    # started until it is shut down again.
+            <entry key="config" type="String">#cloud-config&#xD;
+bootcmd:&#xD;
+- ln -s -t /etc/rc.d /etc/rc.local&#xD;
+hostname: Server-A&#xD;
+manage_etc_hosts: true&#xD;
+runcmd:&#xD;
+- start ttyS0&#xD;
+- systemctl start getty@ttyS0.service&#xD;
+- systemctl start rc-local&#xD;
+- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config&#xD;
+- echo "UseDNS no" &gt;&gt; /etc/ssh/sshd_config&#xD;
+- service ssh restart&#xD;
+- service sshd restart&#xD;
+users:&#xD;
+- default&#xD;
+- gecos: User configured by VIRL Configuration Engine 0.18.9&#xD;
+  lock-passwd: false&#xD;
+  name: cisco&#xD;
+  plain-text-passwd: cisco&#xD;
+  shell: /bin/bash&#xD;
+  ssh-authorized-keys:&#xD;
+  - VIRL-USER-SSH-PUBLIC-KEY&#xD;
+  sudo: ALL=(ALL) ALL&#xD;
+write_files:&#xD;
+- path: /etc/init/ttyS0.conf&#xD;
+  owner: root:root&#xD;
+  content: |&#xD;
+    # ttyS0 - getty&#xD;
+    # This service maintains a getty on ttyS0 from the point the system is&#xD;
+    # started until it is shut down again.&#xD;
+    start on stopped rc or RUNLEVEL=[12345]&#xD;
+    stop on runlevel [!12345]&#xD;
+    respawn&#xD;
+    exec /sbin/getty -L 115200 ttyS0 vt102&#xD;
+  permissions: '0644'&#xD;
+- path: /etc/systemd/system/dhclient@.service&#xD;
+  content: |&#xD;
+    [Unit]&#xD;
+    Description=Run dhclient on %i interface&#xD;
+    After=network.target&#xD;
+    [Service]&#xD;
+    Type=oneshot&#xD;
+    ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease&#xD;
+    RemainAfterExit=yes&#xD;
+  owner: root:root&#xD;
+  permissions: '0644'&#xD;
+- path: /etc/rc.local&#xD;
+  owner: root:root&#xD;
+  permissions: '0755'&#xD;
+  content: |-&#xD;
+    #!/bin/sh -e&#xD;
+    ifconfig eth1 up 192.168.2.200 netmask 255.255.255.0&#xD;
+    route del default&#xD;
+    route add default gw 192.168.2.1&#xD;
+    exit 0&#xD;
+&#xD;
+- path: /etc/resolv.conf&#xD;
+  owner: root:root&#xD;
+  permissions: '0644'&#xD;
+  content: |&#xD;
+    # ttyS0 - getty&#xD;
+    # This service maintains a getty on ttyS0 from the point the system is&#xD;
+    # started until it is shut down again.&#xD;
     nameserver 8.8.8.8</entry>
         </extensions>
         <interface id="0" name="eth1" ipv4="10.0.0.14" netPrefixLenV4="30"/>