Fixed the first few comments from Charlie.