More scripting updates