Modified some files, improve the project