Some string and comment fixes