Script improvements.