Various schematic changes and additions