fix hour formatting, update ordering