simplify  pagination selector; update comments