Rework the mod sorting, partly better now