Fix and update script and binary