Add favoriting
Add slightly better logging