Bug fixes and improved timeout handling

This release includes bug-fixes, improves the detection for when a future should timeout and adds a new polling strategy that takes into account timeouts to improve the detection lag.