Small fixes and change some wording