favorite, comments, some fixes
merge