fix bad paths, and a minor shuffle of pages