Finally fixed time and date debacle (hopefully)