Random types for each route, various other small improvements.