fix page count, other tweaks