Changes in functions/workflow load order, and minor changes