Comment and typos changes