Simplified injection exports. Minor improvements. Docco documentation for scenario and client.