Fix minor bugs
Identify missed date format