Added more debugging options, added the evil failing test of a changing query....