Minor cleanup
reduce fixups
minor refactoring
making relativization work without subpages
minor refactoring