Router sorting/matching fixes/tests
More comments
Removed outcommented code