Tidied up schematic, fixed up ERC warnings.