more schematic fixups and tidy