added timeout to join, increased wait