back-back-bug fixed
temporary timeout added
some minor changes