Few changes
Correncted some errors