update of files to solve some bugs.