More script tweaking