Add some commas, general improvements