added some timeouts, and acks