Improvements to orchestration with make and fig