Added 2 servo interfaces, many pin swaps