Added Favorites functionality and fixes some bugs.