adding timeout and fixing lint