moved pagestore again, fixed a bug or two, added TODO