- 2nd pass over the routing api
- Updated apidocs
- More unit tests fixes