Choose routes is optional now/fixed several other bugs