album predict, pagination, various tweaks, refactoring