corrected routing bugs