fixes #22, #18, date parser bug fix.