Added queries (sorted alphabetically) and filled in some information in general.py