Time script improvements