fix minor bugs and timezone