cosmetic changes, and better comments