fixed some formatting and date arrangement