Added Simulator Hub plus few others minor stuff.