Some improvements (favs, refsets, and some fixes)