Add thousands separator and bug fix