removed ambigous queries, added --help switch