Renamed and added information about queries

Gave the queries better names, added a description in comments at the
top.