Dashes fix
Commas fix