More changes, in search for the bug which hangs the connection. AAARGH!