added -z for no-ncbi in query; cleaned up, etc.