improving timeouts and logging a bit