fix timer, fix stream