Bunch of Script updates