fixed minor bugs and included default time-zone