Improve README and change some comments