Put FX in their own groups to enforce ordering
further log tweaks