Script touch-ups