add timeout, fix bug in time display