filepath and script fixes