fix comma and strings