More assorted tweaks
Post-conference touchup