More changes to the script tuner (just getting it working basically for now)