make regex for convert more comprehensive; capture commas