improve multipage stuff some more