Updated scripts, see notes within