Better query handling.  No more dropping the port.  More tests.