fixing date parsing and a regex