a few schematic tweaks, mostly cosmetic