Improve routing, update demos.