Fixed code to handle values that have commas, "M", "B", and "T"