fix timezone handling, make more explicit