Commas and typos and style errors fixes