Change mods ordering and fix update