Added checking for objects with search options, as well as a number of other features

I suck at these comments...