fixing bug & tuning routing table