move dates to Long
Improve date handling