Form part1. Some route fixes.