Cleanup pcb

Some changes that didn't make it thru git yet
What was wrong with the current image?