pragmatic changes to pageflow and more internationalization