improve multipage stuff a bit