Finish up work on #146

It's mainly working; a small riff on Web site proofs.