change a few sentences and removed warning