Enhanced search capabilities. Only a few cosmetic changes will be necessary (plus code cleanup). This closes #7