Finally fixed all time format problems(?)