put MicroMaTch connectors on the correct side, clean up routing