improved shaper logic; raised timeouts