changed some strings and date format on enhancement by Devin