Incorporate 'special pages', various minor changes