more queries, better design, readme