fixed some more swaps