addressed review comments
reset time outs
fixed jshint