Date parsing

Better date parsing, and proper return in the recursive statement