bug fixes and add time zone