Cosmetic changes and a few comments.

Andrea