Finalizing Favorites, fixes for bugs brought up in client meeting.