Comment and linguistic fixes