patches: update script and organise