changed pagechange stuff
more adjustments