minor changes in var naming
added handling and ordering for next 1 hour of events