fixed favorites first and some other shit