Improvements (Favs, Refsets, fixes)