Minor adjustments to the routing class.
Added todo note.