fixed coma and date problems