More script improvements.