Correct some scripts, add more informations