Correct him/her translation and tweak swapping further