Minor schematic fixes, major PCB layout changes