small cleanups and timeout on feedback between Q's