Swap to new puzzle and tweak click to be more forgiving