Scripting mini-overhaul