misc changes improving handling of moved pages