routing2.py fixes