Feature/get better popularities

Fixes #3