* routing improvements. (still in progress)