Cleaning up Slop

Cleaned up some sloppy code and added preferences for most of the Query
Types.