Random script improvements