more timeout, added cofee dependency, refactor comments
new build