Fix wildcard, optional parameters.
Decode URL parameters.
Work on URL generation.
Increment versions.
Fix conflicts. Merge.