finished the queries for the site to look semi decent