Fixed all routing code.