working on making queries work or changing the ones that don't