clean up formatting, run all upgrade listeners on fallthrough, set socket timeout to two minutes