More routing. Also cleaned up schematic