comments, minor reorg