swaps refactored and works ok
Some more stuff related to Vanishing jewels.