More searching, more fixes, started work on Favorites!