test
Lots of bug fixes and tweaked popularity algorithm