Improved route display. Solved more sync issues