add timeout (higher) and lint cleanups