Improvements to FIG orchestration

Also comment this