Check in for next hop discovery and some bugs fixing.