fix time-zone issues and spec