Some improvements to hour selection
Merge remote-tracking branch 'origin/TheOneAndOnlyBranchCreatedByTheGreatestHumanOfAllTime' into NewestBranchByPeterK