Multi hub

Just some minor changes for multihub and better introspection/error reporting.