various fixes, favorites still bugged