finish incorporating ipv6 patches