Correct script files and minor update