More Comments and reorganizations