pagination quick fix
various upgrades