Correct some sound bugs on swapping. Add sounds effects for transistions
resolve conflict