Add date timezone workaround, clean, fix hours