fixed timeouts and added stats