adds some sample queries and a lot of other good stuff...tidies the infr...

...astructure a little bit