More formatting fixes, and fleshed out the rest of the query docs