bug fixes

still has the problem( timeout error)