recommender improve + fix bugs