Update scripts
Fix scripts further