Faster surfaces!

Also person reordering on maps, a beginning of some obstruction code,
and bug fixes.