fix times etc