big rework, introduce favorites, fixes #5