I lied.

Finished moving things around on how extra scaffolding is loaded (order
wise) as they have to come before the existing functions to allow them
to override url parameters.

Few other things, too tired to think.