Resolve routes with optional and dynamic params
Fix embedding in subdirectory
Some doc updates