New and updated queries, more documentation