made a couple of tweaks to nexthop selection based off fwdVid
Hopefully resolved merge conflicts