Bugfix
Corrected errors in how routing info is retrieved
Corrected errors in how routing info is retrieved
Removed faked routing info
Restructuring
Minor changes