fix broken swaps
fix bad path
fix incorrect swaps