cleanup
numpages tweak