typos
queries optimized a bit