added testing_script, minor changes elsewhere