cleaned up addressing in border router