Added all the searches, cleaned up the code a bit.