fix comment
NAT testing and improvements