adding favourites and fixing bugs