fixed more timezone issues