More comments, minor reorg, cosmetic changes