Loads of bugfixes, mostly due to the recent introduction of pages.