Little changes and add coments