Routing graph fixes, works pretty well now...