Cosmetic changes and comments. Other minor changes