Bug fixes, PCB is correct, code works ok!