* some minor fixes + more debugging on queries