Fixed solver puzzle bug in swap method and hueristic calculation updated