handle more pages, minor fixes