* Correcting some bugs