Cleaned up the schematic connections -- PCB is still a mess though