major bugfix: timeouts weren't working properly.