cleanup code
change connection timeout