cleanups
Add timeout to connection handler