fixed pagination, tiny tweaks