Some improvements to hour selection