increase timeout + some jscs