Fixed slow connection problem, possibly other things