multiple pages and other fixes