better timeout, better homedir