fixed some of the script organizations