fixing bugs, updating other files,...

fixing bugs, updating other files,...