Script FIxes

In Progress