diff --git a/doc/plan.org b/doc/plan.org
index cb8ecb9..aafb199 100644
--- a/doc/plan.org
+++ b/doc/plan.org
@@ -711,8 +711,15 @@ INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00
 
 According to pcap/static_nat64-2019-04-03-0932-h3.pcap ethernet frame
 looks good. Still no reply / reaction from host h3.
-****** TODO Fix IPv4 header checksum // wrong according to wireshark
+****** DONE Fix IPv4 header checksum // wrong according to wireshark
 When & how to update?
+****** TODO check packets static_nat64-2019-04-03-0957-h1.pcap: answer not outputted/natted!
+
+INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00:01 type=0x86dd |<IPv6  version=6 tc=0 fl=0 plen=32 nh=ICMPv6 hlim=255 src=fe80::200:aff:fe00:1 dst=ff02::1:ff00:42 |<ICMPv6ND_NS  type=Neighbor Solicitation code=0 cksum=0x37df res=0 tgt=2001:db8::42 |<ICMPv6NDOptSrcLLAddr  type=1 len=1 lladdr=00:00:0a:00:00:01 |>>>> from table TABLE_V6_NETWORKS
+INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00:01 type=0x86dd |<IPv6  version=6 tc=0 fl=0 plen=32 nh=ICMPv6 hlim=255 src=fe80::200:aff:fe00:1 dst=ff02::1:ff00:42 |<ICMPv6ND_NS  type=Neighbor Solicitation code=0 cksum=0x37df res=0 tgt=2001:db8::42 |<ICMPv6NDOptSrcLLAddr  type=1 len=1 lladdr=00:00:0a:00:00:01 |>>>> from table TABLE_V6_NETWORKS
+INFO:main:unhandled reassambled=<Ether  dst=33:33:ff:00:00:42 src=00:00:0a:00:00:01 type=0x86dd |<IPv6  version=6 tc=0 fl=0 plen=32 nh=ICMPv6 hlim=255 src=2001:db8::1 dst=ff02::1:ff00:42 |<ICMPv6ND_NS  type=Neighbor Solicitation code=0 cksum=0x13a7 res=0 tgt=2001:db8::42 |<ICMPv6NDOptSrcLLAddr  type=1 len=1 lladdr=00:00:0a:00:00:01 |>>>> from table TABLE_V6_NETWORKS
+INFO:main:unhandled reassambled=<Ether  dst=00:00:0a:00:00:42 src=00:00:0a:00:00:03 type=0x800 |<IP  version=4 ihl=5 tos=0x0 len=84 id=60628 flags= frag=0 ttl=64 proto=icmp chksum=0x78d2 src=10.0.0.1 dst=10.1.1.1 options=[] |<ICMP  type=echo-reply code=0 chksum=0x9138 id=0x26e9 seq=0x1 |<Raw  load='\x8b\x83\xa4\\\x00\x00\x00\x00S*\x06\x00\x00\x00\x00\x00\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./01234567' |>>>> from table TABLE_V6_NETWORKS
+
 
 ***** TODO transform protocol specific: icmp -> icmp6
 ****** DONE Make switch answer IPv4 icmp echo request for
diff --git a/p4src/static-mapping.p4 b/p4src/static-mapping.p4
index c35d31b..14fdc2f 100644
--- a/p4src/static-mapping.p4
+++ b/p4src/static-mapping.p4
@@ -339,35 +339,6 @@ Echo or Echo Reply Message
         default_action = controller_debug_table_id(TABLE_ICMP);
     }
 
-    /********************** debugging / general support ***********************************/
-
-    // table port2mcast {
-    //     key = {
-    //         standard_metadata.ingress_port : exact;
-    //     }
-    //     actions = {
-	// 		multicast_pkg;
-    //         controller_debug;
-    //         NoAction;
-    //     }
-    //     size = NDP_TABLE_SIZE;
-    //     default_action = NoAction;
-    // }
-
-    // /* Handle multicast registration of NDP */
-    // table addr2mcast {
-    //     key = {
-    //         hdr.ipv6.dst_addr: exact;
-    //     }
-    //     actions = {
-	// 		multicast_pkg;
-    //         controller_debug;
-    //         NoAction;
-    //     }
-    //     size = NDP_TABLE_SIZE;
-    //     default_action = NoAction;
-        // }
-
     /********************** ARP ***********************************/
 
     action arp_reply(mac_addr_t mac_addr) {