add fav and a lil refactor