Fix even more typos, arrange parts in the schematic.