Use Location in some Scripts
some script fixes