fixed orchestrator minor problems