finally fixed popularity scaling (mostly)