Address possible partial data delivery pointed out in #1
Increase the connection timeout to something more sane, addressing #1