simple fixes + timeout/delegation for connection