Added two more options.

Changes the formatting of debug functions and converted them to actual
query functions.