correcting some errors !