Improve loggging
Drop timeout to 1min