fix timeout and commented code