Fixed two bugs with scramble generator

 - penultimate/last were not being set properly
 - typo in sameAxis method