restore nexthop - and small cleanup