Fixed gapclose a bit, added Q keepalive