stopusing ipaddr, switch to ipaddress, fixup on addresses