fix parse date, and small fixes