small fixes, default timeout = 5sec