Fixed up the last of the features in scripting.