script improvements